merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Mon, 4 Feb 2008 15:17:58 +0000 (08:17 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Mon, 4 Feb 2008 15:17:58 +0000 (08:17 -0700)
commitc5bc3e2e4938b103b2e21e8f230bf55d00485242
tree0e68db2fd0faf5712acf50b1b75c5bdb7198d98a
parent330759ba03067ca12f7036bffd44a7e8163d2136
parent08286e1a3c5809b2a5441d47d06a4aded8142a3d
merge with xen-unstable.hg